From 0a6813d0aa4c7214cf60b2c8b6bc20cad830015e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 28 May 2019 18:58:58 -0400
Subject: [PATCH] menu tool button: Make final

---
 gtk/gtkmenutoolbutton.c | 17 +++++++++++++++++
 gtk/gtkmenutoolbutton.h | 35 -----------------------------------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 48491e7663..df6305b4ef 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -63,6 +63,23 @@
  * ]|
  */
 
+typedef struct _GtkMenuToolButtonClass   GtkMenuToolButtonClass;
+typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
+
+struct _GtkMenuToolButton
+{
+  GtkToolButton parent;
+
+  GtkMenuToolButtonPrivate *priv;
+};
+
+struct _GtkMenuToolButtonClass
+{
+  GtkToolButtonClass parent_class;
+
+  void (*show_menu) (GtkMenuToolButton *button);
+};
+
 
 struct _GtkMenuToolButtonPrivate
 {
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 02c261b2f5..03304dbbe1 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -31,44 +31,9 @@ G_BEGIN_DECLS
 
 #define GTK_TYPE_MENU_TOOL_BUTTON         (gtk_menu_tool_button_get_type ())
 #define GTK_MENU_TOOL_BUTTON(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButton))
-#define GTK_MENU_TOOL_BUTTON_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
 #define GTK_IS_MENU_TOOL_BUTTON(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_IS_MENU_TOOL_BUTTON_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_MENU_TOOL_BUTTON))
-#define GTK_MENU_TOOL_BUTTON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_MENU_TOOL_BUTTON, GtkMenuToolButtonClass))
 
-typedef struct _GtkMenuToolButtonClass   GtkMenuToolButtonClass;
 typedef struct _GtkMenuToolButton        GtkMenuToolButton;
-typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
-
-struct _GtkMenuToolButton
-{
-  GtkToolButton parent;
-
-  /*< private >*/
-  GtkMenuToolButtonPrivate *priv;
-};
-
-/**
- * GtkMenuToolButtonClass:
- * @parent_class: The parent class.
- * @show_menu: Signal emitted before the menu is shown.
- */
-struct _GtkMenuToolButtonClass
-{
-  GtkToolButtonClass parent_class;
-
-  /*< public >*/
-
-  void (*show_menu) (GtkMenuToolButton *button);
-
-  /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
 
 GDK_AVAILABLE_IN_ALL
 GType         gtk_menu_tool_button_get_type       (void) G_GNUC_CONST;
-- 
2.30.2